Free font_desc. Fixes #132805.

2004-01-28  Richard Hult  <richard@imendio.com>

	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):
	Free font_desc.  Fixes #132805.

diff --git a/ChangeLog b/ChangeLog
index 9b4b62cc43146e23fd6a6680943d2156a8286bb4..8b8d583eb7f143c545bf330662e3ac76745429e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2004-01-28  Richard Hult  <richard@imendio.com>
+
+       * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):
+       Free font_desc.  Fixes #132805.
+
 2004-01-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
        Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+       Fixes #132574.
 
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9b4b62cc43146e23fd6a6680943d2156a8286bb4..8b8d583eb7f143c545bf330662e3ac76745429e5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,13 @@
+2004-01-28  Richard Hult  <richard@imendio.com>
+
+       * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):
+       Free font_desc.  Fixes #132805.
+
 2004-01-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
        Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+       Fixes #132574.
 
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9b4b62cc43146e23fd6a6680943d2156a8286bb4..8b8d583eb7f143c545bf330662e3ac76745429e5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,13 @@
+2004-01-28  Richard Hult  <richard@imendio.com>
+
+       * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):
+       Free font_desc.  Fixes #132805.
+
 2004-01-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
        Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+       Fixes #132574.
 
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9b4b62cc43146e23fd6a6680943d2156a8286bb4..8b8d583eb7f143c545bf330662e3ac76745429e5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,13 @@
+2004-01-28  Richard Hult  <richard@imendio.com>
+
+       * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):
+       Free font_desc.  Fixes #132805.
+
 2004-01-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
        Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+       Fixes #132574.
 
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9b4b62cc43146e23fd6a6680943d2156a8286bb4..8b8d583eb7f143c545bf330662e3ac76745429e5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,13 @@
+2004-01-28  Richard Hult  <richard@imendio.com>
+
+       * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):
+       Free font_desc.  Fixes #132805.
+
 2004-01-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
        Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+       Fixes #132574.
 
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 8adae8a28f2c51d9edd791becd63a12034ef804e..f1f78967919f9873e4a2912e6182f8d4b327c567 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1308,7 +1308,9 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
       row_height = (pango_font_metrics_get_ascent (metrics) +
                    pango_font_metrics_get_descent (metrics));
       pango_font_metrics_unref (metrics);
-      
+
+      pango_font_description_free (font_desc);
+
       gtk_cell_renderer_set_fixed_size (cell,
                                        cell->width, 2*cell->ypad +
                                        celltext->fixed_height_rows * PANGO_PIXELS (row_height));